bitkeeper revision 1.1236.1.60 (42299622PoSV4xT6Ds22AHb8mP24xA)

XCS binds thru /var/lib/xen and gives better error message if this
fails.
Signed-off-by: Muli Ben-Yahuda <mulix@mulix.org>
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/misc/xend b/tools/misc/xend
index e4cd65271f5491dbb26b872e4e88fd128974a4a5..4a6a09f29409f4c82680cb2268215dd47298c735 100644 (file)
--- a/tools/misc/xend
+++ b/tools/misc/xend
@@ -24,7 +24,7 @@ import sys
 import socket
 import time
 
-XCS_PATH = "/var/xen/xcs_socket"
+XCS_PATH = "/var/lib/xen/xcs_socket"
 XCS_EXEC = "/usr/sbin/xcs"
 XCS_LOGFILE = "/var/log/xcs.log"
 

diff --git a/tools/xcs/xcs.c b/tools/xcs/xcs.c
index 583bef3cc97665715f3cf7b081c8ba17f51c52e7..79342dc444625ae7422b9885e0d0693d510ff486 100644 (file)
--- a/tools/xcs/xcs.c
+++ b/tools/xcs/xcs.c
@@ -241,7 +241,7 @@ static int listen_socket (char *listen_path)
 
     if (bind(s, (struct sockaddr *) &a, sizeof (a)) < 0) 
     {
-        perror ("bind");
+        fprintf (stderr, "bind('%s'): %s\n", listen_path, strerror(errno));
         close (s);
         return -1;
     }

diff --git a/tools/xcs/xcs_proto.h b/tools/xcs/xcs_proto.h
index 10ac7dafedd8a1cc83a3746310dcf8efadcc918f..fa04621f4048b51b22ca2b5abd92b9b44affacb9 100644 (file)
--- a/tools/xcs/xcs_proto.h
+++ b/tools/xcs/xcs_proto.h
@@ -9,7 +9,7 @@
 #ifndef  __XCS_PROTO_H__
 #define  __XCS_PROTO_H__
 
-#define XCS_SUN_PATH     "/var/xen/xcs_socket"
+#define XCS_SUN_PATH     "/var/lib/xen/xcs_socket"
 
 /* xcs message types: */
 #define XCS_CONNECT_CTRL       0 /* This is a control connection.     */